Merge V1.1

Seems ready to go. Tested and working on Chrome 27, Safari 6, Firefox 21, Opera 11, IE 8. Hasn't shown any problems running alongside Confluence (excluding [ITSM-3419][1], JIRA, OSQA, or OpenMRS ID.

[1]: https://tickets.openmrs.org/browse/ITSM-3419