local changes before merging
mearge head
fixed scroll to and added angular-touch to the index file.