merge latest work to master

site is working and running on open shift