Merge branch 'Demo'
Integration
Merge branch 'Demo' of https://github.com/404Tracker/ChefNetwork

Conflicts:
	app/src/main/java/com/example/chef/chefnetwork/MainActivity.java
Merge remote-tracking branch 'origin/Demo'
App Icon
Merge branch 'master' into master_After

Conflicts:
	app/app.iml
	app/src/main/AndroidManifest.xml
App Icon