changed default action 'actionDefault' to 'actionEntry'
Merge branch '2.0'