com
Merge branch 'master' of https://github.com/dvaldman/BielaNoc

Conflicts:
	external_libs/appcompat_v7_5/bin/android-support-v7-appcompat.jar