add config file to heroku deployment branch
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
add update script configuration file
Merge branch 'develop'
show only movie name instead of full path in web client
add imdb icon and only show imdb link when information exists
add and link favicon
now possible to add a movie to collection and mark it as watched

many changes needed as I ran into scala bug 1133 and upgrading to 2.10.0 (where this bug is fixed) is too much hassle at the moment
use bootstrap icons for ease and consistency
Merge branch 'develop'
adjust css layout to try get firefox working properly
Merge branch 'develop'
Merge branch 'develop'
Merge remote-tracking branch 'heroku/master'

Conflicts:
	src/main/resources/webapp/css/site.css
move to scala 2.10
Merge branch 'develop'