bvla
Merge branch 'master' of merijn:/var/www/html/groupoffice-webclient

Conflicts:
	nbproject/project.properties
Merge branch 'master' of merijn:/var/www/html/groupoffice-webclient
:-)
Merge branch 'master' of merijn:/var/www/html/groupoffice-webclient

Conflicts:
	app/modules/kitchensink/views/main.html
Merge branch 'master' of merijn:/var/www/html/groupoffice-webclient

Conflicts:
	app/core/components/form/autocomplete/_autocomplete.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/scss/_utils.scss
	app/scss/_widgets.scss
dialog
michael view
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scss/_widgets.scss
Merge branch 'master' of 192.168.0.22:/var/www/go7/groupoffice-webclient

Conflicts:
	app/scss/_header.scss
	app/scss/_icons.scss
	app/scss/_utils.scss
	app/scss/_widgets.scss
Renamed variables