Merge pull request #9 from plon33r/tmp

Tmp
gallery issue
Merge pull request #10 from plon33r/tmp

gallery issue
album refresh
Merge branch 'dev' into sprint2

Conflicts:
	Hackathon[2014]/gen/.gitignore
	Hackathon[2014]/res/values/strings.xml