8/4/2014 updates

Updates to iMap template
Merge branch 'master' of https://github.com/mdgio/iMap