commit

2014_04_15_15_12
Merge branch 'master' of https://github.com/nyul/nRF_TP

Conflicts:
	application.cpp