...
Merge branch 'master' of https://github.com/palaloi/ist-ploy

Conflicts:
	ist-ploy/app/views/layouts/application.html.erb