Merge branch 'master' into development
Documents pages finished
finished competitions page with jquery
Merge branch 'development'