Merge branch 'master' of https://github.com/br00t999/bitcoinchartsr

Conflicts:
	NAMESPACE
Merge branch 'master' of https://github.com/br00t999/bitcoinchartsr