# Conflicts:
#	user/component-login/src/main/AndroidManifest.xml
#	user/component-login/src/main/java/com/gingersoft/gsa/cloud/user/login/LoginActivity.java
#	user/component-login/src/main/res/layout/user_login_activity.xml