Fix link errors when boost version larger or equal than 1.54
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/HackFisher/keyhotee into HackFisher-master