Updated doc
merge
Added bower compenents
merge
Merge branch 'gh-pages' into dev