[WEB APP] pozycje
Merge branch 'master' of https://github.com/sylgas/gopr

Conflicts:
	webapp/GoprWebApp/src/main/java/com/springapp/mvc/repository/GroupRepository.java
	webapp/GoprWebApp/src/main/java/com/springapp/mvc/repository/UserInActionRepository.java
Merge branch 'master' of https://github.com/sylgas/gopr
Merge branch 'master' of https://github.com/sylgas/gopr

Conflicts:
	webapp/GoprWebApp/src/main/java/com/springapp/mvc/repository/GroupRepository.java
	webapp/GoprWebApp/src/main/java/com/springapp/mvc/repository/dao/GroupDao.java
[ANDROID]