continuing style tests
Merge branch 'master' of https://github.com/filbot/dntr

# By Phil Puleo
# Via Phil Puleo
* 'master' of https://github.com/filbot/dntr:
  Add styling for mapping container height/width, add test controller, Google maps api, map directive.

Conflicts:
	app/css/app.css
	app/partials/main.html