Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/application.conf
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
index.html and routes file fixed
main.scala.html and index.scala.html deleted
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Created Panda-Module
Updated Dependencies