initial
everything
pics
Merge branch 'feature/views' into develop

Conflicts:
	.gitignore
	app/api/.gitignore
	app/api/composer.json
	app/api/src/Api/Application.php
	app/api/src/Api/Model/Features.php
	app/api/tests/Test/Functional/FeaturesTest.php
	app/api/tests/Test/Unit/FeaturesTest.php
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/main.js
	app/views/about.html
	app/views/main.html