database modified
Merge branch 'master' of github.com:jinnings/Kickoff

Conflicts:
	src/com/jn/kickoff/activity/SquardFragment.java
	src/com/jn/kickoff/constants/Constants.java
	src/com/jn/kickoff/manager/CountryManager.java