updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;