refactor: merge

composer.json

-{"name":"quiqqer\/qui","type":"component","description":"QUIQQER-UI is a modular user interface component framework written in JavaScript","version":"dev-dev","license":"MIT","authors":[{"name":"Henning Leutz","email":"leutz@pcsg.de","homepage":"http:\/\/www.pcsg.de","role":"Developer"}],"support":{"email":"support@pcsg.de","url":"http:\/\/www.pcsg.de"},"require":{"robloach\/component-installer":"*"},"extra":{"component":{"files":["**"],"config":{"paths":{"qui":"qui\/build\/qui"}},"paths":{"qui":"qui\/build\/qui"},"map":{"*":{"css":"components\/qui\/build\/qui\/lib\/css.js"}}}}}
\ No newline at end of file
+{"name":"quiqqer\/qui","type":"component","description":"QUIQQER-UI is a modular user interface component framework written in JavaScript","version":"dev-master","license":"MIT","authors":[{"name":"Henning Leutz","email":"leutz@pcsg.de","homepage":"http:\/\/www.pcsg.de","role":"Developer"}],"support":{"email":"support@pcsg.de","url":"http:\/\/www.pcsg.de"},"require":{"robloach\/component-installer":"*"},"extra":{"component":{"files":["**"],"config":{"paths":{"qui":"qui\/build\/qui"}},"paths":{"qui":"qui\/build\/qui"},"map":{"*":{"css":"components\/qui\/build\/qui\/lib\/css.js"}}}}}
\ No newline at end of file