camera demo

- fixed bug in adapter line 43 from parent -> null
- added image button for profile in workouts fragment
- saves image name to preferences for retrieval as profile pic
Merge branch 'camera-demo'

Conflicts:
	bin/DatabaseTestApp.apk
	bin/classes.dex

	bin/classes/edu/miracosta/cs134/databasetestapp/MainActivity$NavTabListener.class
	bin/classes/edu/miracosta/cs134/databasetestapp/MainActivity.class
	bin/classes/edu/miracosta/cs134/databasetestapp/R$string.class
	bin/classes/edu/miracosta/cs134/databasetestapp/R$style.class
	bin/classes/edu/miracosta/cs134/databasetestapp/R$xml.class
	bin/classes/edu/miracosta/cs134/databasetestapp/WorkoutAdapter.class

	bin/classes/edu/miracosta/cs134/databasetestapp/WorkoutsGridFragment.class
	bin/resources.ap_
	gen/edu/miracosta/cs134/databasetestapp/R.java