Merge branch 'feature/bootstrap_3.0' into develop
Merge branch 'develop' of github.com:Naeka/vosae-web into develop