stbc
Merge branch 'master' of https://github.com/Facius/LoremJS

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
	app/views/models.html