Merge branch 'master' of https://github.com/NeiroNx/Intercomm

Conflicts:
	Intercomm/src/main/java/com/nxn/intercomm/MainActivity.java
Merge remote-tracking branch 'origin/master'