geoloc problem underscore.js resolved -_-
Merge branch 'insert-geoloc'
removed tmp file
Merge branch 'master' of github.com:WagAlex/Showpcase

Conflicts:
	tmp/cache/assets/development/sprockets/003650ed09f7cd69ac5ac53b7f60ac29
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/b5141e67399e5b4e001a419d61d87a9d
	tmp/cache/assets/development/sprockets/c36e068682f58729d12f72dcc2f576a4
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
removed tmp file