Merge pull request #1 from bbaloo/master

adapting bootstrap to photoshoter project - temporary version - map not ...
- fix names
Merge branch 'master' of https://github.com/yoman07/PhotoShoter
Merge pull request #2 from bbaloo/master

working version of bootstrap adapted to Photoshoter project
- add event library
- add socket io client
add libraries and comet client
add libraries and comet client
Merge remote-tracking branch 'upstream/master'
merge with upstream