Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails into develop
Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails into develop
fix object undef in form error helper
Merge pull request #803 from toadkicker/develop

fix object undef in form error helper
add type attribute to button for bootstrap flashes
Merge pull request #809 from tielur/add-type-to-bootstrap-flash-button-and-specs

Add type attribute to button for bootstrap flashes
Fixing font paths.
Merge pull request #811 from evgeny-myasishchev/move-flyphicons-to-twitter

Font paths for Glyphicons were pointing to BS 2.3 png files that are no longer actual
add arabic assets
Merge branch 'arabic_assets' into develop
Merge branch 'develop'