routes conflict fix
Merge branch 'm-development'
devise signin ajax
merging
remove old js file