commit to merge with bootstrap to allow rebase
Merge branch 'master' into bootstrap3
error was with rolify gem https://github.com/EppO/rolify/commit/26ec434ef6d1a544f9a76b560ea0f4efae006600 is fix