Mods to dashboard.blade.php
Merge branch 'master' into barryn
Mods to dashboard.blade.php
Merge branch 'master' into barryn

Conflicts:
	public/js/charts/chart2.js
Work on chart1 & chart 3
Merge branch 'master' into barryn
Work on start.php and chart1
Merge branch 'master' into barryn
Update chart1
Merge branch 'master' into barryn
Update chart1 and chart3
Minor tweaks to chart3
Merge branch 'master' into barryn

Conflicts:
	app/views/dashboard/savingViews/dashboard.blade.php
	bootstrap/start.php
	public/js/charts/chart1.js
	public/js/charts/chart3.js
Minor tweaks to chart1 & chart2
Merge branch 'master' into barryn
Add chart test to file
Merge branch 'master' into venkman
Merge
Minor change to chart2
Merge branch 'master' into barryn