idea project files
YOLO

Merge branch 'develop' of https://github.com/johniak/AndroidLayoutDesign into develop

Conflicts:
	App/CookBook/.idea/copyright/profiles_settings.xml
	App/CookBook/.idea/libraries/appcompat_v7_19_0_1.xml
	App/CookBook/.idea/libraries/fadingactionbar_3_1_2.xml
	App/CookBook/.idea/libraries/library_0_4_0.xml
	App/CookBook/.idea/libraries/library_0_9_9.xml
	App/CookBook/.idea/libraries/library_1_0_4.xml
	App/CookBook/.idea/libraries/library_1_5_0.xml
	App/CookBook/.idea/libraries/library_extra_1_5_0.xml
	App/CookBook/.idea/libraries/support_v4_19_0_1.xml
	App/CookBook/app/app.iml
small fix