changes
moveLists
fix
Merge branch 'master' into bootstraped

Conflicts:
	css/main.css
	protected/views/hike/publicEquipmentEdit.php