- :( lets see
Merge branch 'master' of https://github.com/aldoinfanzon/Erdinger

Conflicts:
	app/controllers/lists/culture/cultureList.js
	app/lib/listDetailsWSCalls.js
	app/lib/myutils.js