Horizontal placing fix
Merge branch 'master' of https://github.com/cmitz/Shoque

Conflicts:
	src/com/saxion/shoque/SetUpActivity.java