production configuration
develop configuration
added somenewfeature.php
Merge branch 'develop'