closes #6
Merge branch '#6-MainMenuModel'
closes #7
Merge branch 'origin/#7-layout'

Conflicts:
	WAP.dproj