Merge Feature/landmark picker into develop

Merging Summer 2014 changes