Major and Minor update
Merge branch 'master' of https://github.com/interactive-events/android-app

Conflicts:
	app/src/main/java/com/wordpress/interactiveevents/interactive_events/BleActivity.java