All my changes in order to add actionbarsherlock and sliding menu to the project - joel
More Changes of the same nature - Joel
Merge branch 'master' of https://github.com/pennja01/NorseSquare

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