Add create location modal
Merge origin/master