Upgraded solution for VS2013
Merge branch 'dev' of https://github.com/cameronfletcher/guardian into dev
Tidying up solution