10-17-2014
10_18_2014
Merge branch 'master' of https://github.com/yansong10101/eSmartGenerator

Conflicts:
	genApp/views.py