Merge pull request #12 from justinkelly69/master

Added award.php and awards.php and updated cb.awards.php
minor edits to default_board_xxxxx
added batteryshop tmpl
added some not owned templates and a json view for buildings
Merge branch 'master' of https://github.com/Techbot/JiGS