update for devoxx 2014
Merge branch 'dev' of https://github.com/aramponi/devoxx-france-android-in-fine into dev

Conflicts:
	res/values-fr/strings.xml
	res/values/strings.xml
	src/com/infine/android/devoxx/util/UIUtils.java

Signed-off-by: Ramponi <aramponi@infine.com>