deleted css
Merge branch 'master' of git.ekreative.com:hi-tech-testing/hi-tech-testing-website

Conflicts:
	sites/all/themes/main/src/css/styles.css
Merge branch 'master' of git.ekreative.com:hi-tech-testing/hi-tech-testing-website

Conflicts:
	sites/all/themes/main/src/css/styles.css
Merge branch 'master' of git.ekreative.com:hi-tech-testing/hi-tech-testing-website

Conflicts:
	sites/all/themes/main/src/css/styles.css
merge
Merge branch 'master' of git.ekreative.com:hi-tech-testing/hi-tech-testing-website

Conflicts:
	sites/all/themes/main/js/script.js
	sites/all/themes/main/templates/node--career.tpl.php
	sites/all/themes/main/templates/node--services.tpl.php
Merge branch 'master' of git.ekreative.com:hi-tech-testing/hi-tech-testing-website
show month in filter only if it has some item
news summaty
video summary
styles for summary
Merge branch 'master' of git.ekreative.com:hi-tech-testing/hi-tech-testing-website
different description if user has been redicted from career page
Merge branch 'newsArchive'
merge
Merge branch 'diffDescriptionForContForm'
show trimmed body if summary is empty
services summary