no change
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bin/classes/com/aviacomm/hwmp2p/HWMP2PClient.class
	bin/classes/com/aviacomm/hwmp2p/team/ConnectionManager.class
	bin/classes/com/aviacomm/hwmp2p/ui/MainPageFragment.class
	bin/classes/com/aviacomm/hwmp2p/ui/StartPageFragment$1.class
	bin/classes/com/aviacomm/hwmp2p/ui/StartPageFragment$2.class
	bin/classes/com/aviacomm/hwmp2p/ui/StartPageFragment$StartPageListener.class
	bin/classes/com/aviacomm/hwmp2p/ui/StartPageFragment.class