Merge branch 'themaster' of https://github.com/DSKUW/farel into themaster

Change-Id: I7be4b619aa12712e9948a6cfaeea1518f65d9bcb
Merge branch 'themaster' of https://github.com/DSKUW/farel into themaster