Merge branch 'dev' of https://github.com/garvankeeley/MozStumbler into 2-level-low-res

Conflicts:
	android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapFragment.java
	android/src/main/java/org/mozilla/mozstumbler/client/navdrawer/MainDrawerActivity.java