fix conflicts
add erpm_password_check flag
fix merge conflict
fix cppcheck warnings and remove useless code
fix conflicts
engine move some methods arround
cleaned link compilation
fixed links errors
Added parameter to disable persistence (on disk) of Bitmap Cache.
Merge branch 'future' of github.com:wallix/redemption into future
Updated proxy configuration templates.
Merge branch 'future' of https://github.com/wallix/redemption into channel
fix conflicts
Refactor Engine and Sesman: Right object is unknown to Sesman
Search WRM in MWRM's directroy if it's not found at original path.
Merge branch 'workflow' of https://github.com/wallix/redemption into channel
Merge branch 'future' of https://github.com/wallix/redemption into channel
fixed size of ChannelDef::name
check authorization channels in mod_rdp and front
split files and removed unnecessary includes