Merge branch 'hotfix/0.6.10'
Merge branch 'release/0.6.11'
Merge branch 'release/0.6.12'
Merge branch 'release/0.6.13'
Merge branch 'release/0.6.14'
Merge branch 'release/0.6.15'
Merge branch 'release/0.6.16'
Merge branch 'release/0.6.17'
Bumped VERSION to 0.6.18
Updated CHANGELOG
Using master branch of twitter-bootstrap-rails with FontAwesome 3.0.2
Merge branch 'hotfix/0.6.18' into develop