Pushed develop into master

Squashed commit of the following:

commit 47d360a33798c3e186e6ac37a7677fbd5751e9ea
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 2 10:17:20 2014 +0000

    Updated .bowerrc file

commit e99f6f4aab91d68742605629ac7a624622324fd1
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Dec 16 22:35:44 2013 +0000

    Updated menu styling, templates and JS
Updated boxMenu render of main views
Merge branch 'master' into develop

* master:
  Updated boxMenu render of main views
  Pushed develop into master

Conflicts:
	js/adapt-contrib-boxmenu.js