11
111
Merge branch 'branch_20131214' of github.com:xici/microassistant into branch_20131214

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo
	MicroAssistant/MicroAssistantMvc3/www/scripts/app.js