14/04/2014 starting develop branch, first commit
conflict test: modify a file on develop branch
conflict test, made on feature branch
Merge branch 'feature_preference' into develop

Conflicts:
	src/mackwell/nlight/LoadingScreenActivity.java

	added change from both
feature branch commit after rebase
feature branch and merge test
new test
Merge branch 'featuer_new' into develop
no ff merge tset
Merge branch 'feature_noff' into develop
Merge branch 'develop'