Some cleaning
Some cleaning
Merge branch 'dev'

Conflicts:
	user_happy.module
remove taxonomy part
cleaning old user_happy file
add the forgetentaxonomy api file
Improve description (steel need improvement)
Improve description (steel need improvement)