删除target
删除忽略文件
修改忽略文件
Merge branch 'master' of https://git.oschina.net/afeilulu/indoorWeb

Conflicts:
	target/stacktrace.log
user and role views added