Merge develop to master

* Routes
* License
* Other stuff