junit 4.6
.
Merge branch 'develop' into node_details
node details view (mocked data), 
added methods baseController.renderError/renderException,...