Commented everything except SQLite stuff

Fixed spacing and indentation too
I don't know what changed
Fixed more merge conflicts
More merge conflicts
Merge branch 'advancedUI' of https://github.com/MinionApp/minion into advancedUI

Conflicts:
	MinionApp/src/uw/cse403/minion/Combat.java
	MinionApp/src/uw/cse403/minion/EditGroupActivity.java
	MinionApp/src/uw/cse403/minion/SkillsActivity.java