working on templates
added flickrjs file
resolved merge issues
removed map template