Merge branch 'svg'
Merge branch 'develop'
added bower components to gitignore
Merge branch 'develop'
updated libraries
Merge branch 'master' into develop