Tranyi/blazer @ c0a918e4a46fb8341059aadb671964e0b5087162

Andrew Kane c0a918e4a4 Merge branch 'master' of https://github.com/djburdick/blazer into djburdick-master		11 lat temu
..
assets	b99efb8e86 Easier nav	11 lat temu
controllers	3cc0ca617b Added maps	11 lat temu
helpers	c0a918e4a4 Merge branch 'master' of https://github.com/djburdick/blazer into djburdick-master	11 lat temu
mailers	fc0c26c142 Added support for multiple data sources	11 lat temu
models	492d28aa49 Destroy dashboard query when query is deleted	11 lat temu
views	c0a918e4a4 Merge branch 'master' of https://github.com/djburdick/blazer into djburdick-master	11 lat temu