Ignoring docs & pdfs
Merge branch 'develop' into release

Complete application that served for the 2012 conference