merge
Merge branch 'master' of github.com:spidermandl/Innovzen
merge
move out exercise manager
merge
merge