adding user.java to parseStarterProject
modifies User.java
needs help for persisting user data into cloud
Adds Item, Character classes, changes Puzzle class
adds trophies page, page displays all items collected by user (in string form). Still needs to persist user successfully
adds some conventional fixes
Merge branch 'master' of https://github.com/clc4/Diversity into clc4-master

Conflicts:
	ParseStarterProject/bin/ParseStarterProject.apk
	ParseStarterProject/bin/classes.dex
	ParseStarterProject/bin/resources.ap_
	ParseStarterProject/gen/com/parse/starter/R.java
	ParseStarterProject/res/values/strings.xml
	ParseStarterProject/src/com/parse/starter/MainMenuActivity.java
	ParseStarterProject/src/com/parse/starter/ParseApplication.java
	ParseStarterProject/src/com/parse/starter/PersistToCloudActivity.java
Merge branch 'clc4-master'