Merge pull request #9 from AppGroup/master

more map stuff added forms + new icons
new buttons

new button test