update to play 2.1 final
Merge branch 'master' of https://github.com/gulbanana/cistern.git
some basic views and test data