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

Conflicts:
	A-Smart-Lecturer/src/aglosh2014/appspot/com/Academy.java
change delete circle and delete course pages
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
Merge pull request #79 from aglos/Liorbs

Liorbs