Feat/infowindow marker - to discuss and refactor!

![5769536166952960](https://cloud.githubusercontent.com/assets/7741426/4180149/da2651f2-36e9-11e4-99f2-7f4800ce56c1.png)