current commit, working on some changes
Merge branch 'master' of https://github.com/pennja01/NorseSquare
my latest commit, pulling code
Merge branch 'master' of https://github.com/pennja01/NorseSquare

Conflicts:
	Android/res/layout/control_panel.xml
	Android/src/com/sp/norsesquare/froyo/NorseSquare.java
	Android/src/com/sp/norsesquare/froyo/SlideList.java
Merge branch 'master' of https://github.com/pennja01/NorseSquare
Merge branch 'master' of https://github.com/pennja01/NorseSquare