ConceptJS
Added a bower.json
Removed a comment.
Merge master