Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
adding tests for controllers group,list etc
fix for BZ 1131843
Merge pull request #18 from ardasgup/master

Added some more tests for controllers