Overridden bootstrap hooks to remove btn-success from buttons and to fix label markup in forms
Fixed CSS spacing in contact editing form - CMS Instrument status fieldset
Merge branch 'master' of https://github.com/eaudeweb/cms.themes

Conflicts:
	cms_manage/css/style.css
Merge branch 'master' of https://github.com/eaudeweb/cms.themes
Merge pull request #227 from sandriu/master

Fix homepage calendar bugs for family portals
Fix for calendar day view
Merge pull request #228 from sandriu/master

homepage global submenu shadow a bit more pale
Merge pull request #229 from sandriu/master

Refs #2428: styles for menu level 4, only for AEWA
Merge pull request #230 from dragos-dumi/master

Fix for calendar day view
Check for contacts before render in country nfp
Removed unused templates
Code cleanup
Merge branch 'master' of https://github.com/eaudeweb/cms.themes
Merge pull request #231 from cristiroma/master

#2397 - Cleanup in  theme
Merge pull request #232 from dragos-dumi/master

Check for contacts before render in country nfp
Tweaking the contacts display
Merge pull request #233 from cristiroma/master

Tweaking the contacts display
Fix for menu
Merge pull request #234 from dragos-dumi/master

Fix for menu
Refs #2428: rename the menu level 4 selectors