refactored version information
Merge branch 'development'
bring HEAD to latest