pull bugs correction from claire (routes names)
Merge branch 'master' of https://github.com/ExpoTeam/expo
correction navigation.js => only 1controlledremote
resolv intern conflict
resolve intern problem
Merge branch 'master' of https://github.com/ExpoTeam/expo

Conflicts:
	src/client/lib/navigation.js
Merge branch 'master' of https://github.com/ExpoTeam/expo
slideshow's creation :
description->textarea
tags->recorded in array