remove uglifyjs and uglifcss filters
Merge pull request #31 from hasantayyar/master

uglifyjs and uglifcss filters removed
remove uglifyjs and uglifcss filters
remove uglifyjs and uglifcss filters in templates
Merge branch 'master' of github.com:okulbilisim/ojs

Conflicts:
	app/Resources/views/ojsbase.html.twig
	app/config/config_dev.yml
Merge pull request #33 from hasantayyar/master

fix conflict
update readme
update readme
Merge pull request #34 from hasantayyar/master

minor update
Merge pull request #6 from okulbilisim/master

merge 5