Added waiting for connection page.
Merge branch 'master' of https://github.com/fj-castor/lunchapp

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	src/com/example/lunchmate/MainActivity.java
Fixed some old bugs.