Fix hid_liber for new keymap framework by yeeeargh
Merge branch 'yeeeargh-patch'
Merge branch 'master' of https://github.com/tmk/tmk_keyboard

Conflicts:
	keyboard/hid_liber/Makefile.lufa
	keyboard/hid_liber/Makefile.pjrc
	keyboard/hid_liber/keymap.c
Merge branch 'master' of https://github.com/tmk/tmk_keyboard