update bower components
bump railsstrap version
fix merge conflict with bower.json
update version info in bower.json
Merge pull request #28 from toadkicker/feature/v331

Feature/v331