Minor changes, now using only highmaps (highcharts included)
Merge branch 'temp'

Conflicts:
	highcharts/app/index.html
	highcharts/app/scripts/main.js
	highcharts/bower.json
New build and fixed merge