initial commit
Merge branch 'master' of https://github.com/SmartInfrastructures/filab-style-app

Conflicts:
	.gitignore