git ignore ----
Merge branch 'develop' of https://github.com/sgkit/frontend-ui into develop

Conflicts:
	.gitignore