pull from master
autofill form jquery
fix merge conflict in view
remove routing in index