adding psd of logo
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop
fixing user bootstrap logging
moving bootstrap logic to reset
#14: supporting registration
adding user profile page
improving question workflow
changing link to log back in after reset
displaying user that submitted question when answering
fixing link labels
syntax and formatting fixes
updating presentation
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop

Conflicts:
	grails-app/conf/BuildConfig.groovy