'VERSION --> APP_VERSION; conflict with Actionview'
Merge branch 'development'