First implementation of dialogs in settings page
Update scrum doc
Forcing app to stay in portrait orientation
More dialogs - have some errors
fixing dialog stuff
Dialogs completely fixed
Merge branch 'OrrBranch'

Conflicts:
	PayBack - CEN3031 Scrum.xlsx