Merge branch 'master'
enter date to phone, yep >_<
Merge branch 'master' into admin
first wave of refactor
refactoring
Merge branch 'admin' into Develop
Deleting com.springapp.mvc
library changes
userCourses page...start
fixed courses URI
Merge remote-tracking branch 'origin/Develop' into Develop
resolve bug #36
Update login.ftl

delete button reset
afterrefactor fixes
afterrefactor fixes
Merge remote-tracking branch 'origin/Develop' into Develop
sorted starting soon courses, fixed bug 39
course table column position, fixed missing status and publish date attributes after update
expert courses page