nothing
Merge branch 'master' of https://github.com/jonkjenn/Ambiguous

Conflicts:
	Ambiguous/src/no/hiof/android/ambiguous/activities/GameActivity.java