Merge branch 'master' of https://github.com/EarthstormSoftware/controllerformote-android

# Conflicts:
#	.idea/misc.xml

Author: raruston