added border
merged conflicts; added build files
Merge pull request #209 from massiveart/feature/dropdowns

feature/dropdowns