Merge branch 'feature-sign-in-out' into develop
Add Static pages controller, views and spec
Finish static pages
Merge branch 'feature-static-pages' into develop
Merge branch 'develop' into feature-sign-in-out

Conflicts:
	.idea/workspace.xml