kit-intranet

Merge branch 'manut' into bugfix/merge1512

# Conflicts:
#	README.md
#	wcm/widget/kit_aniversariantes/src/main/resources/application.info
#	wcm/widget/kit_cardapio/src/main/resources/application.info
#	wcm/widget/kit_convenios/src/main/resources/application.info
#	wcm/widget/kit_news/src/main/resources/application.info
#	wcm/widget/kit_organograma/src/main/resources/application.info
#	wcm/widget/kit_slideshow/src/main/resources/application.info