Merge pull request #18 from hasantayyar/master

article-citation relations and bower implementation
Merge pull request #19 from hasantayyar/master

very first implementation of ui
Merge pull request #20 from hasantayyar/master

punks not dead!
Merge pull request #1 from okulbilisim/master

merge
Merge pull request #21 from hasantayyar/master

merge
Merge pull request #22 from hasantayyar/master

massive merge -2
Merge pull request #2 from okulbilisim/master

merge
gitignore updated for Apple Fan Boys
readme updated for setup
Merge pull request #25 from hmert/master

Readme updated and config
Merge pull request #26 from hasantayyar/master

massive merge -3
Merge pull request #3 from okulbilisim/master

merge 3
Merge pull request #27 from hasantayyar/master

minor updates
theme style modifications
article index
Merge pull request #28 from hmert/master

theme modifications
Merge pull request #30 from hasantayyar/master

some fixes
Merge pull request #31 from hasantayyar/master

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

Conflicts:
	app/Resources/views/ojsbase.html.twig
	app/config/config_dev.yml