Merged code on 16/10/14

Codebases have been merged and styling seems to be consistent.  I will
update Trello based on the tasks for today and issues that need to be
immediately resolved before work begins today.  Current merged code is
working perfectly in terms of functionality.