specify globals in js file rather jshintrc
create our own filter for translating consumption to equivalent in the stats
Merge branch 'master' into improve-angular
show wattage in stats
Merge branch 'master' into improve-angular
32x32 favi
Merge branch 'master' into improve-angular

Conflicts:
	index.php
Merge branch 'master' into improve-angular
Merge branch 'refs/heads/master' into improve-angular
update auto prefixer
move file around to keep our inc folder hidden from public :)
move DB update script to new location
update version 0.2.4