Merge remote-tracking branch 'upstream/master'
Fix #304 Git commit emails appear escaped (sometimes)

If the commit author is greater than 15 characters smart_word_breaker
may introduce a <wbr /> between a HTML entity. For example
Sahil Muthoo <sahil.muthoo@gmail.com> becomes
Sahil Muthoo &l<wbr/>t;sahil.m<wbr/>uthoo@gmail.com&gt;.
Merge remote-tracking branch 'upstream/master'
Remove Resource sqlmap and move functionality to Hibernate.
[HelpDoc] Changes in Server Details page about License
Merge pull request #328 from ermauliks/master

[HelpDoc] Changes in Server Details page about License
#137 - Reverted rails4 specfic fixture changes from jsunit fixture. Added a new test fixture for new rails
Merge pull request #320 from sahilm/issue-304

Fix #304 Git commit emails appear escaped (sometimes)
#137 - Fixing failing javascript tests for fixture corresponding to new rails
Merge remote-tracking branch 'upstream/master' into hib03
Merge pull request #327 from RikTyer/hib02

Move Resource persistence to Hibernate.
Removed console.log from js test
Moving config_view#show views to rails4
Moving config_view#_job_view partial to rails4
Merge branch 'master' into rails_4_config_view
Moving config_view controller to rails4
Merge pull request #329 from sachinsudheendra/rails_4_config_view

#130 - config_view/* migration
#130 - Copy Environment index.json and index_json_spec from old Rails to new Rails.

* No changes made. Just copied the files.
#130 - Fix Environment index.json and index_json_spec for new Rails.
Merge pull request #330 from mdaliejaz/environments_json

#130 - Moved Environment index.json and index_json_spec to new Rails.