Added programmatically generated imageview
Merge branch 'master'

Conflicts:
	res/layout/activity_overview.xml
	src/org/concordacademy/photoapp/Overview.java