Merge branch 'develop'
add constants
Merge branch 'feature1' into develop