Merge branch 'master' of https://github.com/gittrdone/sourcecontrol
Merge branch 'reports'

Conflicts:
	charting/urls.py
	charting/views.py
	sourcecontrol/settings.py
Merge branch 'master' of heroku.com:sourcecontrol-dev into reports

Conflicts:
	charting/urls.py
	charting/views.py