Changes for server side implementation (unicorn)
Merge branch 'develop' of github.com:danst0/Portfolio into develop

* 'develop' of github.com:danst0/Portfolio:
  Server required changes