Adonis: photochoose complete.
Merge branch 'master' of https://github.com/adonis1992/Hallo-Welt

Conflicts:
	HalloWelt/bin/classes/com/lkf/hallowelt/controllers/DiaryController.class
	HalloWelt/bin/classes/com/lkf/hallowelt/screens/diary/PhotoChooseView.class