2014/8/17 B+ work
Merge branch 'master' of https://github.com/winstonwoo/bluefocus

Conflicts:
	app/triggerApp
	app/triggerApp.c
	module/.tmp_versions/trigger.mod
	module/.trigger.ko.cmd
	module/.trigger.mod.o.cmd
	module/.trigger.o.cmd
	module/Makefile
	module/modules.order
	module/trigger.ko
	module/trigger.mod.c
	module/trigger.mod.o
	module/trigger.o