taken pictures are displayed properly according to each album.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/itec/code2smile/MainActivity.java
Merge remote-tracking branch 'origin/master'