Taking pictures or browsing through pictures
Merge branch 'master' of https://github.com/madnessxd/almende

Conflicts:
	AlmendeMotivator/out/production/AlmendeMotivator/AlmendeMotivator.apk
	AlmendeMotivator/out/production/AlmendeMotivator/AlmendeMotivator.unaligned.apk
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R$id.class
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R$layout.class
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R$string.class
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R.class