Davide Bellini e9702e4292 Merged branch master and fixed conflict
After Password Strength merge this branch have 2 conflict:
- gulpfile.js
- public/build/rev-manifest.json

All conflicts solved now
2015-10-03 12:53:43 +02:00
..
2015-06-19 11:51:47 +01:00
2015-07-06 17:37:01 +01:00