Merge branch 'dev' into AccessControl
js working properly. some polishing needed
Merge branch 'dev' into AccessControl
Merge branch 'master' into AccessControl

Conflicts:
	src/main/resources/InstructorSampleData.json
Merge branch 'AccessControl' into 73683928
UI is roughly done
Merge branch 'dev' into AccessControl
Merge branch 'master' into AccessControl
Merge branch 'AccessControl' into 73683928
Merge branch 'dev' into AccessControl
Merge branch 'master' into AccessControl

Conflicts:
	src/test/resources/pages/InstructorHomeHTMLEmpty.html
	src/test/resources/pages/InstructorHomeNewInstructorWithSampleCourse.html
	src/test/resources/pages/InstructorHomeNewInstructorWithoutSampleCourse.html
	src/test/resources/pages/instructorHomeCourseDeleteSuccessful.html
Merge branch 'AccessControl' into 73683928
edit save action done. some checking of mistakes needed
add instructor done
fixing tests
Merge branch 'dev' into AccessControl

Conflicts:
	src/test/java/teammates/test/cases/ui/browsertests/StudentProfilePageUiTest.java
Merge branch 'AccessControl' into 73683928
fixing tests
Merge branch 'dev' into 73683928

Conflicts:
	src/main/resources/InstructorSampleData.json
Merge branch 'dev' into 73683928

Conflicts:
	src/main/resources/InstructorSampleData.json
	src/test/resources/pages/InstructorHomeHTMLEmpty.html
	src/test/resources/pages/InstructorHomeNewInstructorWithSampleCourse.html
	src/test/resources/pages/InstructorHomeNewInstructorWithoutSampleCourse.html
	src/test/resources/pages/instructorHomeCourseDeleteSuccessful.html