update to current build-tools version
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	asecrypto-goes-mobile-app/asecrypto-goes-mobile-app-asecrypto-goes-mobile-app.iml