Updating develop build settings
Adding Travis CI config to gitignore
Adding more multimedia and styles
Merge branch 'develop'

Conflicts:
	.travis.yml