Change primary key name as clashing with another table
Add support for SSL
Merge branch 'feature/Playing_with_SSL' into develop