jaja
* test
Merge branch 'master' of ssh://git@github.com/FHB-Systemintegration/TravInfoRepo.git
autocomplete, places, panoramia, bootstrap-typeahead (alle js); werden noch weiter bearbeitet!
weather commit
Merge branch 'master' of ssh://git@github.com/FHB-Systemintegration/TravInfoRepo.git
* neuer Host (IP)
Merge branch 'master' of https://github.com/FHB-Systemintegration/TravInfoRepo.git
remove test fail
Merge branch 'master' of ssh://git@github.com/FHB-Systemintegration/TravInfoRepo.git
deploy test
fix  bootstrap link
fix helper.js
Merge branch 'master' of https://github.com/FHB-Systemintegration/TravInfoRepo

Conflicts:
	Webseite/source/index.html
Merge branch 'master' of https://github.com/FHB-Systemintegration/TravInfoRepo

Conflicts:
	Webseite/source/js/src/base.js
including js-files and needed id's (searchInput, searchButton)
schreibfehler in index.html
fix grunt for automated jasmine-jquery test via console
*überarbeitete Cachefunktion
*Überarbeitung des Programmablaufs
Merge branch 'master' of
ssh://git@github.com/FHB-Systemintegration/TravInfoRepo.git