remove all
fix
Merge branch 'dev' into production

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/sociallib/app/model/GoogleSocialObject.java
	app/src/main/java/com/example/sociallib/app/model/SocialObject.java
	app/src/main/java/com/example/sociallib/app/sample/LoginActivity.java
	app/src/main/java/com/example/sociallib/app/sample/MainActivity.java
	app/src/main/java/com/example/sociallib/app/sample/SocialUtils.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/menu/main.xml
fix
fix
fix
Merge branch 'dev' into production

Conflicts:
	app/src/main/java/com/example/sociallib/app/model/InstagramSocialObject.java
branch merge fix