actus fix
Merge branch 'master' of https://github.com/goldenDelicious/av

Conflicts:
	js/home.js