Merge branch 'develop'
fix #36 acp teamsize field  js validation
#37 Viewplanner refactoring
#37 (cont.)
Merge branch 'master' into develop