Add location adding and dropdown javascript
Merge from origin master