updating style properties
Merge branch 'master' of https://github.com/jsiochi/MapStoryComposer
directives for dropdown selection
fixing merge conflicts in bootstrap.css