!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/android_support_v4.xml
	.idea/libraries/google_play_services.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
after merge