Merge pull request #4 from castomer/master

dos2unix & astyle
new astream
Merge pull request #5 from castomer/master

account in two unit: second & minute
add event_time and modity it to insert_time
add event_time and modity insert_time
Merge remote-tracking branch 'upstream/master'
add event_time
Conflicts:
	config.json
	src/main/java/com/baidu/storm/kafka/bolt/MongoAccoutBolt.java
	src/main/java/com/baidu/storm/kafka/common/SpoutConfigParser.java
	src/main/java/com/baidu/storm/kafka/config/ConfigFile.java
	src/main/java/com/baidu/storm/topology/AStream.java
rm .swp file
merge new master