Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/openjaf/cenit
Merge branch 'develop'
add module dashboard with a first controller overview
Merge pull request #9 from openjaf/init_dashboard_template

Was added the Dashboard module with a first controller named Overview
remove residual lines of git conflig
Merge branch 'master' of github.com:openjaf/cenit into feature/d3js_usage
remove line conflig