added maps
added show event
databse yml file changes
fix conflicts
Merge pull request #15 from mansoorelahi/shwetha

added maps