Merge pull request qmk#1132 from akatrevorjay/pr/dfu-serial

Allow to specify serial to dfu-util flash

Merge pull request qmk#1185 from exiva/rn42_bluetooth

Add RN42 Bluetooth module support

Merge pull request qmk#1184 from osamuaoki/master

Update keymap.md to QMK

Clarify the quantum license (qmk#1042)

* Clarify the license for files we have signoff on

* Update against the currently signed off files

* Remove unused and not clearly licensed headers

* Replace an #endif I accidentally removed while resolving merge conflicts

Merge pull request qmk#1112 from newsboytko/newsboytko/midi-keycodes

Flesh out MIDI support

Merge pull request qmk#1098 from lambdalisue/tapping-force-hold

Add TAPPING_FORCE_HOLD to regulate behaviour

Merge pull request qmk#1162 from Khord/master

My customized keymap + some tunes for the song list

Merge pull request qmk#1177 from exiva/bluetooth_refactor

Refactor Bluetooth Handling

Merge pull request qmk#1143 from UnintendedFeature/feature/keymap-ger…

…man-lukas

keymap german lukas

Merge pull request qmk#1119 from phongnh/master

Removes redundant {} which cause build failure when DEBUG_ACTION is set