finish branch
to Friday 23 August 2013
Merge branch 'dev' of https://github.com/the-ramones/submit-jpa.git into development