update application
clean
clean
Merge branch 'master' of https://github.com/coursemdetw/2014c2

Conflicts:
	2014s_c2_project.leo
clean