Added images in app. Added date picker button to diary view page +
activity
Merge branch 'master' of
https://github.com/SEAHood/Team6IndustrialProject.git

Conflicts:
	res/layout/diary_view.xml