first commit
Merge branch 'dev' of https://github.com/Fant0m771/meningit

Conflicts:
	.gitignore
	sites/localhost.meningit/themes/custom/meningitis/css/global.base.css
	sites/localhost.meningit/themes/custom/meningitis/css/global.styles.css
	sites/localhost.meningit/themes/custom/meningitis/css/lt-ie9.css
	sites/localhost.meningit/themes/custom/meningitis/css/print.css
	sites/localhost.meningit/themes/custom/meningitis/css/responsive.custom.css
	sites/localhost.meningit/themes/custom/meningitis/css/responsive.smalltouch.landscape.css
	sites/localhost.meningit/themes/custom/meningitis/css/responsive.smalltouch.portrait.css
	sites/localhost.meningit/themes/custom/meningitis/css/responsive.tablet.portrait.css