css

@author : Guillaume Martigny
Merge origin/master

Conflicts:
	js/lib.js