Fix permissinons for the themes directory
Remove ~ files from git
Merge branch 'master' of github.com:kanei/ESF-MU-Portal

Conflicts:
	src/themes/omega_esf/preprocess/html.preprocess.inc