added latest changes from master and started js work
cleaned up unwanted files from merge with website