minor changes.
minor changes #2
Merge branch 'master' of https://github.com/jsmunich/HappyHangup

* 'master' of https://github.com/jsmunich/HappyHangup:
  Add Start page to App.

Conflicts:
	.idea/workspace.xml