Added my parts. Haven't tested yet. Will do that this afternoon.
Some files missed out.
Merge branch 'master' of https://github.com/nhvtgd/STEMPLUSPLUS

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/mit/edu/stemplusplus/CustomizedGallery.java