Fixed load/save bug
Merge fix
Merge branch 'development' of https://github.com/lucaspi/AndroidRally into development

Conflicts:
	AndroidRally/src/se/chalmers/dryleafsoftware/androidrally/MainActivity.java
Merge branch 'development' of https://github.com/lucaspi/AndroidRally into development