layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/libraries/appcompat_v7_19_1_0.xml
	App/App.iml
	libraries/facebook/facebook.iml
	uMorning.iml
layout