add iid index to role types table
Fixed view_paths for widgets
added version number to friendly_id in gemspec
fixed version number of erp_forms
updated migration to reload Website columns
added better error message handling to erp_app login
added support for rhtml and erb templates
Merge branch 'codemirror_update'
fixed bug in apply themes to ckeditor
merge with master