Improved take pictures from mainActivity. Improved album indexing.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/itec/code2smile/GalleryActivity.java
	app/src/main/java/itec/code2smile/MainActivity.java