Merge branch 'release/1.0.2' into dev
fix bower ignore
bump version
bump version
Merge branch 'release/1.1.1'
Merge branch 'release/1.1.1' into dev
Merge branch 'dev' of github.com:antistatique/Cortana-Swiss-Admin into dev
bump version
Merge branch 'release/1.1.2'