Merge branch 'origin/master'
adasd
controller commits
View commit
db commit
Merge branch 'origin/jon'

Conflicts:
	SODAwcfService/SODAwcfService/App_Data/SodaDB.mdf
	SODAwcfService/SODAwcfService/App_Data/SodaDB_log.ldf
updated layout
Merge branch 'origin/ash'
updates
Merge branch 'origin/ash'
add purchase link
details: add purchase link
important: pull mo to
important: portal changes
IMPORTANT: portal main.css
removed due to long filename error
readded SODAPaypal due to filename error
controller commit
helper commit - for debugging only
config commits