close #18
Merge branch 'feature/18-fix-bower-dependencies' into dev