update
Merge branch 'master' of https://github.com/movalen/graduate_web

Conflicts:
	media/tiny_mce/config.js