Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Remove Resource sqlmap and move functionality to Hibernate.
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.
ServiceCacheStrategy.clear_services should run after every spec