conflict
Merge branch 'master' of github.com:campus-march-2014/gitter

Conflicts:
	src/main/java/github/services/RepositoryCollector.java
Merge branch 'master' of github.com:campus-march-2014/gitter
Solve conflicts
Merge branch 'master' of github.com:campus-march-2014/gitter
Test for update the base
Merge branch 'master' of github.com:campus-march-2014/gitter