Got the checkin back to working status ~zack
Merge branch 'master' of https://github.com/pennja01/NorseSquare

Conflicts:
	Android/src/com/sp/norsesquare/froyo/NorseSquare.java