Merge pull request #2 from okulbilisim/master

merge
favicon
merge & conflick
main layout #42
left menu #42
Merge pull request #133 from hmert/master

merge
Merge pull request #1 from okulbilisim/master

up