Merged from upstream
Resolve conflict
Updated .bower.json
Merged successfully
change resource link
Merge pull request #5 from trystant/master

Merged fixes