Updated app and comments added to code

	Commit by: Simon, Robert