Merge pull request #1 from mike4git/master

Filter file for Infinitest
updated documentation
fixed license header
* Test for DemoController implemented
  * Mockito inserted
  
* Update String changed (added current date)
Merge branch 'master' of https://github.com/encoway/edu