updated files to add promo module
add app
added app changes
Merge branch 'build-040713'
update reset_date.rb to fix nil date issue
Merge branch 'build-040713'
updated added unmerged files
reupdated unmerged files
additional unmerge files
updated unstaged view files
clean up last unstaged files
removed unstaged files
removed unstaged files
updated branches