:)
:)
Merge remote-tracking branch 'origin/HEAD' into ios

Conflicts:
	app/controllers/generic/details/listDetails.js
	app/controllers/generic/rows/rowFour.js
:)
Merge remote branch 'origin/ios'

Conflicts:
	app/controllers/generic/details/listDetails.js
	app/controllers/generic/map/mapDetails.js
	app/controllers/lists/events/eventsList.js