Update features from webdevesgi
Merge branch 'master' of https://github.com/rhannequin/ayouken

Conflicts:
	app.rb
	plugins/Doc.rb
	plugins/Other.rb