else statement for the each loop
rollback activate to setupController again in the userRoute
Merge branch 'master' into gh-pages