First pass at removing inline javascript events and discuss with team
Fixing the merge conflict
Merge branch 'ealameda-master'