change in dist for testing
resolwe conflicts
update dist file, remove invliad url in oauth
Merge branch 'dev' into test

Conflicts:
	.gitignore
	dist/v1.raml
Added dist
All schemas should be correct.
Merge branch 'test' into dev