Details
Merge branch 'master' of https://github.com/minzaurralde/ol4rent.git

Conflicts:
	.gitignore