Add glyphicon-camera.
Merge conflict.
Merge branch 'master' of https://github.com/pgillet/Glue.git
Merge conflicted files.
Feedback
Merge branch 'master' of https://github.com/pgillet/Glue.git