Commit para merge de files

Cambio a estructura?
Merge remote-tracking branch 'origin/master'

Conflicts:
	basetracker/urls.pyc
	bt/static/css/plugins/c3charts/c3.css
	bt/static/js/demo/c3-charts.js
	bt/static/js/plugins/c3charts/c3.js
	bt/static/js/plugins/c3charts/c3.min.js
	templates/base.html