Merge branch 'master' of https://github.com/theophil/Map
Merge branch 'master' of https://github.com/theophil/Map
Merge branch 'master' of https://github.com/theophil/Map
Edited many of the view pages, tried to make the interface a little more usable. added a chronological scope for village_activity model
fixed conflicts from attempted merge with Gale