Merge branch 'development' into emre

Conflicts:
	activities.php
	findabuddy.php
	index.php
	nbproject/project.properties
	nbproject/project.xml
	news.php
	universities.php
	volunteer_application.php
Merge branch 'development' into emre

Conflicts:
	admin/index.php
	admin/login.php
	models/Admin.php
Merge branch 'development' into emre

Conflicts:
	admin/index.php
Merge branch 'development' into emre

Conflicts:
	admin/index.php
student sayfası hazırlandı tablo olusturuldu.
student sayfası hazırlandı tablo olusturuldu.
Merge remote-tracking branch 'origin/emre' into emre