Merge remote-tracking branch 'upstream/master'

Conflicts:
	project.properties
	src/com/veken0m/bitcoinium/MainActivity.java