DEC 14, 13pm
DEC 14, 20pm
Merge branch 'guocheng' of https://github.com/NeutronStarCO/Neutron.git
into guocheng

Conflicts:
	src/com/neutronstar/neutron/Appstart.java
	src/com/neutronstar/neutron/NeutronContract.java