Merge branch 'release/0.6.8' into develop
updated API documentation
Merge branch 'develop' of git://github.com/all-ride/ride-lib-form into develop
added HmltRow to support js and css assets to the frontend
fixed merge conflict
bumped version
Merge branch 'release/0.7.0'