Added grails-app to the git ignore list
Merge branch 'master' of https://github.com/supavut/gisbangkok

Conflicts:
	.gitignore
	grails-app/conf/BootStrap.groovy
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.groovy
	grails-app/conf/DataSource.groovy
	grails-app/conf/UrlMappings.groovy
	grails-app/conf/spring/resources.groovy
	grails-app/controllers/road_accident_phase1/MainController.groovy
	grails-app/domain/com/accident/Passenger.groovy
	grails-app/domain/com/accident/config/AccidentType.groovy
	grails-app/domain/com/accident/config/CrashPattern.groovy
	grails-app/domain/com/accident/config/Horizontal.groovy
	grails-app/domain/com/accident/config/Intersection.groovy
	grails-app/domain/com/accident/config/IslandType.groovy
	grails-app/domain/com/accident/config/Light.groovy
	grails-app/domain/com/accident/config/Reason.groovy
	grails-app/domain/com/accident/config/RoadAtCurrentTime.groovy
	grails-app/domain/com/accident/config/RoadDirection.groovy
	grails-app/domain/com/accident/config/RoadHumidity.groovy
	grails-app/domain/com/accident/config/RoadLane.groovy
	grails-app/domain/com/accident/config/RoadSurface.groovy
	grails-app/domain/com/accident/config/RoadType.groovy
	grails-app/domain/com/accident/config/RoadTypeSpecial.groovy
	grails-app/domain/com/accident/config/SpecificArea.groovy
	grails-app/domain/com/accident/config/UTurn.groovy
	grails-app/domain/com/accident/config/Weather.groovy
	grails-app/domain/com/accident/config/passenger/PassengerEquipment.groovy
	grails-app/domain/com/accident/config/passenger/PassengerGender.groovy
	grails-app/domain/com/accident/config/passenger/PassengerInjury.groovy
	grails-app/domain/com/accident/config/passenger/SeatPosition.groovy
	grails-app/domain/com/accident/config/person/CarType.groovy
	grails-app/domain/com/accident/config/person/PersonDrivingLicense.groovy
	grails-app/domain/com/accident/config/person/PersonDrug.groovy
	grails-app/domain/com/accident/config/person/PersonEquipment.groovy
	grails-app/domain/com/accident/config/person/PersonGender.groovy
	grails-app/domain/com/accident/config/person/PersonInjury.groovy
	grails-app/views/layouts/bangkokLayout.gsp
	grails-app/views/main/create.gsp
	grails-app/views/main/edit2.gsp
	grails-app/views/main/list.gsp