commit
Merge branch 'master' of https://github.com/aglos/A-Smart-Lecturer into avshalom

Conflicts:
	A-Smart-Lecturer/src/aglosh2014/appspot/com/Academy.java
Add course to a circle dynamically with Admin
change delete circle and delete course pages
add course
Merge pull request #77 from aglos/Ohad's-branch

Ohad's branch
Merge branch 'master' of https://github.com/aglos/A-Smart-Lecturer into
avshalom

Conflicts:
	A-Smart-Lecturer/src/aglosh2014/appspot/com/Academy.java
	A-Smart-Lecturer/src/aglosh2014/appspot/com/Course.java
	A-Smart-Lecturer/war/WEB-INF/inc/Admin/addCourse.jsp
change datastore
ll