MQATOT-24 paperjam
Merge branch 'master' of github.com:mqadev/tot2014