bumping version to v3.1.1-m2
fix bower json and just use 3.1.1 instead of 3.1.1-m3
Merge branch 'master' into gh-pages