#14 Update tests
#16 Do not reload portlet if there is no configuration
Merge branch 'development'