Development and production ready.
Merge master and resolve conflicts