Test Update on Configuration Class :)
Merge branch 'master' of https://github.com/shikazu/LifCP

Conflicts:
	configuration.class.php