Refactored some code and added icons
Merge branch 'master' of https://github.com/mwong56/angelhack2014

Conflicts:
	src/com/android/upick/activities/MainActivity.java