fb
Merge branch 'master' of https://github.com/eyanai/nextStar_app

Conflicts:
	images/header/hdr_logo_kohav.png
	js/script.js
ipad 3
Merge branch 'master' of https://github.com/eyanai/nextStar_app