Merge up from dev to master

* 2014 site update
* optimised images
* re-included the application form