modified:   Gemfile
	modified:   app/mailers/user_mailer.rb
	modified:   public/assets/application-6868ae5649a06059238a9068135885ed.css.gz
	new file:   public/assets/application-c3d3a41c2657373d41aefa48e54fa1d3.js
	new file:   public/assets/application-c3d3a41c2657373d41aefa48e54fa1d3.js.gz
	modified:   public/assets/application.css.gz
	modified:   public/assets/application.js
	modified:   public/assets/application.js.gz
	new file:   public/assets/back-a9d129ec441d3e0697116f16c2420431.png
	new file:   public/assets/back.png
	new file:   public/assets/foundation/orbit/bullets-0ef17726444fdafabfee9e0379b90b28.jpg
	new file:   public/assets/foundation/orbit/bullets.jpg
	new file:   public/assets/foundation/orbit/left-arrow-fe4637c7f3e149b7deae167d1c71893e.png
	new file:   public/assets/foundation/orbit/left-arrow-small-2dca068ec6187e6ec094ad0becc35b68.png
	new file:   public/assets/foundation/orbit/left-arrow-small.png
	new file:   public/assets/foundation/orbit/left-arrow.png
	new file:   public/assets/foundation/orbit/loading-9289b2d5b67646e03036083f0803baa7.gif
	new file:   public/assets/foundation/orbit/loading.gif
	new file:   public/assets/foundation/orbit/mask-black-42888274f4021233fbb6064ec8a80e27.png
	new file:   public/assets/foundation/orbit/mask-black.png
	new file:   public/assets/foundation/orbit/pause-black-73a6ba1fb98f0fdffc5f741bde3af970.png
	new file:   public/assets/foundation/orbit/pause-black.png
	new file:   public/assets/foundation/orbit/right-arrow-48d7705f1cd6396e9d7a7d286bfccf0c.png
	new file:   public/assets/foundation/orbit/right-arrow-small-59b2e7a7cc2388465376e79d003b0f9d.png
	new file:   public/assets/foundation/orbit/right-arrow-small.png
	new file:   public/assets/foundation/orbit/right-arrow.png
	new file:   public/assets/foundation/orbit/rotator-black-8f0ad2be2c48a61866dd278dddf8beaf.png
	new file:   public/assets/foundation/orbit/rotator-black.png
	new file:   public/assets/foundation/orbit/timer-black-42888274f4021233fbb6064ec8a80e27.png
	new file:   public/assets/foundation/orbit/timer-black.png
	new file:   public/assets/ico/48x48/facebook-6bd5e1f61747a2172ceef698fd70caa4.png
	new file:   public/assets/ico/48x48/facebook.png
	new file:   public/assets/ico/48x48/twitter-56e4d9ea4f72e07cf476be037d1caf3e.png
	new file:   public/assets/ico/48x48/twitter.png
	modified:   public/assets/lightview/blank-99eeeddc62cb4b433bc2c891909ca6f5.gif
	modified:   public/assets/lightview/blank.gif
	modified:   public/assets/lightview/dark/sprite-62a326153684e77a4c7b699ba154f307.png
	modified:   public/assets/lightview/dark/sprite.png
	modified:   public/assets/lightview/dark/sprite_ie_lt_7-4c30805054ce3865561c2a0f369d4aa4.png
	modified:   public/assets/lightview/dark/sprite_ie_lt_7.png
	modified:   public/assets/lightview/light/sprite-e085157b0b2cae91207610f7c7ab96ef.png
	modified:   public/assets/lightview/light/sprite.png
	modified:   public/assets/lightview/light/sprite_ie_lt_7-3c6425d9a54b0c4d8c6f0d0aaadd4473.png
	modified:   public/assets/lightview/light/sprite_ie_lt_7.png
	modified:   public/assets/lightview/mac/sprite-258ec2c5beeccb225267a95dd2c316f8.png
	modified:   public/assets/lightview/mac/sprite.png
	modified:   public/assets/lightview/mac/sprite_ie_lt_7-77b447fb49c52a5ff01547191dbc9daf.png
	modified:   public/assets/lightview/mac/sprite_ie_lt_7.png
	modified:   public/assets/lightview/raso/sprite-62a326153684e77a4c7b699ba154f307.png
	modified:   public/assets/lightview/raso/sprite.png
	modified:   public/assets/lightview/raso/sprite_ie_lt_7-4c30805054ce3865561c2a0f369d4aa4.png
	modified:   public/assets/lightview/raso/sprite_ie_lt_7.png
	new file:   public/assets/logo-a93807b32d218311cf0d6ebe49309d29.png
	new file:   public/assets/logo.png
	modified:   public/assets/manifest.yml
	new file:   public/assets/nobile-164b6e367648e4ccf2d16f4c3e12862f.ttf
	new file:   public/assets/nobile.ttf
	new file:   public/assets/nobile_bold-7666945b5e6d1fe986e8dec6e76b2d18.ttf
	new file:   public/assets/nobile_bold.ttf
	new file:   public/assets/nobile_bold_italic-07ea2561d938d6fd8f6074ca6d763201.ttf
	new file:   public/assets/nobile_bold_italic.ttf
	new file:   public/assets/nobile_italic-8752e2877eb0929dd2958d1066c8a639.ttf
	new file:   public/assets/nobile_italic.ttf
	new file:   public/assets/public/application-7270767b2a9e9fff880aa5de378ca791.css
	modified:   public/assets/public/application-7270767b2a9e9fff880aa5de378ca791.css.gz
	new file:   public/assets/public/application.css
	modified:   public/assets/public/application.css.gz
	new file:   public/assets/rails-be8732dac73d845ac5b142c8fb5f9fb0.png
	new file:   public/assets/rails.png
	new file:   public/assets/slide/1-9b9ce0206b9d89f30b12390f4b615091.jpg
	new file:   public/assets/slide/1.jpg
	new file:   public/assets/slide/2-0b6407223ffcec8e1a062c75898188ef.jpg
	new file:   public/assets/slide/2.jpg
	new file:   public/assets/slide/3-74736243ce9a2863b3a5a55639997604.jpg
	new file:   public/assets/slide/3.jpg
	new file:   public/assets/slide/slide-7dc4065b3f3aaecdf47a37636f008eb4.psd
	new file:   public/assets/slide/slide.psd
	new file:   public/assets/social/128x128/delicious-b995f456edfd0f7b87a4006e52066557.png
	new file:   public/assets/social/128x128/delicious.png
	new file:   public/assets/social/128x128/digg-40fd040b1524b243d9e7a242bff85a2e.png
	new file:   public/assets/social/128x128/digg.png
	new file:   public/assets/social/128x128/facebook-f0a758fd9bacc04a760abb0ec682604f.png
	new file:   public/assets/social/128x128/facebook.png
	new file:   public/assets/social/128x128/flickr-61e69d78efc5522e8201ee73a08bfca2.png
	new file:   public/assets/social/128x128/flickr.png
	new file:   public/assets/social/128x128/furl-89eea4dd5897c6e6ec2aa94173f824ca.png
	new file:   public/assets/social/128x128/furl.png
	new file:   public/assets/social/128x128/reddit-776705d131071bac312f81642e9f2af1.png
	new file:   public/assets/social/128x128/reddit.png
	new file:   public/assets/social/128x128/rss-e9a58003c240ec82a91566b594a5eff1.png
	new file:   public/assets/social/128x128/rss.png
	new file:   public/assets/social/128x128/stumbleupon-92572d61c61507c7f9782c0ade0e09fb.png
	new file:   public/assets/social/128x128/stumbleupon.png
	new file:   public/assets/social/128x128/technorati-2c6bb92401e3e27ba4d93c4360c22c49.png
	new file:   public/assets/social/128x128/technorati.png
	new file:   public/assets/social/128x128/twitter-e4b1cb675b8a95e96a8fd6423c79e2c5.png
	new file:   public/assets/social/128x128/twitter.png
	new file:   public/assets/social/128x128/yahoo-42b3dea640a1a0c0dc97c6c63a92001e.png
	new file:   public/assets/social/128x128/yahoo.png
	new file:   public/assets/social/128x128/youtube-d58ab5fadf30c67f8590f66ec6e8fd84.png
	new file:   public/assets/social/128x128/youtube.png
	new file:   public/assets/social/16x16/delicious-dc370bf39d4590499dcad20fc0893130.png
	new file:   public/assets/social/16x16/delicious.png
	new file:   public/assets/social/16x16/digg-635126ae9600b0aefff77eb750250877.png
	new file:   public/assets/social/16x16/digg.png
	new file:   public/assets/social/16x16/facebook-cb8bbb7cdfd5e76aaf564b8f3ef1617a.png
	new file:   public/assets/social/16x16/facebook.png
	new file:   public/assets/social/16x16/flickr-cb231b61d119685431a01a463b50137b.png
	new file:   public/assets/social/16x16/flickr.png
	new file:   public/assets/social/16x16/furl-6abcccb57a537ba27de02cc26c1b3458.png
	new file:   public/assets/social/16x16/furl.png
	new file:   public/assets/social/16x16/reddit-e3fdd1d26b7a51b0f6a1097e2a4aa13c.png
	new file:   public/assets/social/16x16/reddit.png
	new file:   public/assets/social/16x16/rss-019dfe33b421edf04671696164048cd9.png
	new file:   public/assets/social/16x16/rss.png
	new file:   public/assets/social/16x16/stumbleupon-6fb5ec74012db465d7b4d5b873d2b391.png
	new file:   public/assets/social/16x16/stumbleupon.png
	new file:   public/assets/social/16x16/technorati-cd2c6bb4ed3e143c847656678858053c.png
	new file:   public/assets/social/16x16/technorati.png
	new file:   public/assets/social/16x16/twitter-133bc798f30bd81ee55e7f1a9ff520ef.png
	new file:   public/assets/social/16x16/twitter.png
	new file:   public/assets/social/16x16/yahoo-a782c80bacc366fe2b84e1144b2b878c.png
	new file:   public/assets/social/16x16/yahoo.png
	new file:   public/assets/social/16x16/youtube-128e59b9f68c2a99a0e46182522ac6fa.png
	new file:   public/assets/social/16x16/youtube.png
	new file:   public/assets/social/24x24/delicious-9afaabe0fc2b1f16021355b590c7f0ac.png
	new file:   public/assets/social/24x24/delicious.png
	new file:   public/assets/social/24x24/digg-95f087dfd62abb06e51d752fab89e59e.png
	new file:   public/assets/social/24x24/digg.png
	new file:   public/assets/social/24x24/facebook-c2ac0177670a5fb0ac0242cc19c7c0ea.png
	new file:   public/assets/social/24x24/facebook.png
	new file:   public/assets/social/24x24/flickr-6f4001358ce38edfe16a221598fe30dd.png
	new file:   public/assets/social/24x24/flickr.png
	new file:   public/assets/social/24x24/furl-f442bf91ec9e81717c0df7fc0a0df338.png
	new file:   public/assets/social/24x24/furl.png
	new file:   public/assets/social/24x24/reddit-bd4bc34171fce60c54a01f71af8e8a80.png
	new file:   public/assets/social/24x24/reddit.png
	new file:   public/assets/social/24x24/rss-c02fb80cb014612171a998df2df64172.png
	new file:   public/assets/social/24x24/rss.png
	new file:   public/assets/social/24x24/stumbleupon-28cb7203c2a6168f55310d44e34e24fb.png
	new file:   public/assets/social/24x24/stumbleupon.png
	new file:   public/assets/social/24x24/technorati-31d67dbf020ac0cbe174e1acd0a4d33e.png
	new file:   public/assets/social/24x24/technorati.png
	new file:   public/assets/social/24x24/twitter-9bc865f395ca17e94efe8fab7d6c068a.png
	new file:   public/assets/social/24x24/twitter.png
	new file:   public/assets/social/24x24/yahoo-2a260731d0d9ef3242a5ab2f0112f585.png
	new file:   public/assets/social/24x24/yahoo.png
	new file:   public/assets/social/24x24/youtube-ee71caa982af63b4b052e2e20a4fe5fa.png
	new file:   public/assets/social/24x24/youtube.png
	new file:   public/assets/social/32x32/delicious-06e07753d755cf512a5711bcb9e035bf.png
	new file:   public/assets/social/32x32/delicious.png
	new file:   public/assets/social/32x32/digg-0a06d6fec313e8a7961e85b40e2bf2be.png
	new file:   public/assets/social/32x32/digg.png
	new file:   public/assets/social/32x32/facebook-9d2e717a83bab238f392dbf7d76bc34c.png
	new file:   public/assets/social/32x32/facebook.png
	new file:   public/assets/social/32x32/flickr-bb25d47d0de9879b9003a631d519ae39.png
	new file:   public/assets/social/32x32/flickr.png
	new file:   public/assets/social/32x32/furl-1cba739fcea012d313478982f490248d.png
	new file:   public/assets/social/32x32/furl.png
	new file:   public/assets/social/32x32/reddit-6b994275c5b913268842209eeb997164.png
	new file:   public/assets/social/32x32/reddit.png
	new file:   public/assets/social/32x32/rss-6a48b47b4c8938ec52fcd1c0b0151edd.png
	new file:   public/assets/social/32x32/rss.png
	new file:   public/assets/social/32x32/stumbleupon-41b27eb7f158efc2bd040277dce83b2a.png
	new file:   public/assets/social/32x32/stumbleupon.png
	new file:   public/assets/social/32x32/technorati-0e75fbf4c1f7a6faa37a114c226b7689.png
	new file:   public/assets/social/32x32/technorati.png
	new file:   public/assets/social/32x32/twitter-7b6d8d8c7569af3ce177291fd66d42a2.png
	new file:   public/assets/social/32x32/twitter.png
	new file:   public/assets/social/32x32/yahoo-b13343ed9e20969b541442848188e436.png
	new file:   public/assets/social/32x32/yahoo.png
	new file:   public/assets/social/32x32/youtube-68dc50d263d70446daec31ce50d0c424.png
	new file:   public/assets/social/32x32/youtube.png
	new file:   public/assets/social/48x48/Thumbs-789b97c403291938fbfb934b3d0ef05c.db
	new file:   public/assets/social/48x48/Thumbs.db
	new file:   public/assets/social/48x48/delicious-433b0d30fc42a8a8f4e3b53c357a6b5f.png
	new file:   public/assets/social/48x48/delicious.png
	new file:   public/assets/social/48x48/digg-1bb0da4a5f3ca51829568cfe72ca2b51.png
	new file:   public/assets/social/48x48/digg.png
	new file:   public/assets/social/48x48/facebook-97e768e2bb005f1f7c7d90a38e5b3906.png
	new file:   public/assets/social/48x48/facebook.png
	new file:   public/assets/social/48x48/facebook_raso-6e184d1487b70ae9898dc72fcd1d0392.png
	new file:   public/assets/social/48x48/facebook_raso.png
	new file:   public/assets/social/48x48/flickr-c969cce8ae1d3f9b22f2f1bac6550ba0.png
	new file:   public/assets/social/48x48/flickr.png
	new file:   public/assets/social/48x48/furl-eae3ad40e607ebbc6317ce21c89101f0.png
	new file:   public/assets/social/48x48/furl.png
	new file:   public/assets/social/48x48/reddit-7ebeb20619f06d56147b748ed70870b4.png
	new file:   public/assets/social/48x48/reddit.png
	new file:   public/assets/social/48x48/rss-90e40f0c76e03538d2427c7846a93195.png
	new file:   public/assets/social/48x48/rss.png
	new file:   public/assets/social/48x48/stumbleupon-8a70a8bca2319e56c2885dcbda764979.png
	new file:   public/assets/social/48x48/stumbleupon.png
	new file:   public/assets/social/48x48/technorati-52e45353599e4a5be4c42ef61614e1f5.png
	new file:   public/assets/social/48x48/technorati.png
	new file:   public/assets/social/48x48/twitter-b1fd592d248a56377b05edfd847fa331.png
	new file:   public/assets/social/48x48/twitter.png
	new file:   public/assets/social/48x48/twitter_raso-1faa47be7eb4cc174d3fdbe42d458625.png
	new file:   public/assets/social/48x48/twitter_raso.png
	new file:   public/assets/social/48x48/yahoo-d3eec36805ea31ba6fd1eba8e000b260.png
	new file:   public/assets/social/48x48/yahoo.png
	new file:   public/assets/social/48x48/youtube-69680288b6a060a1676ad4648fe74019.png
	new file:   public/assets/social/48x48/youtube.png
	new file:   public/assets/social/48x48/youtube_raso-98e287f04e2a537df231a11aa0047ce6.png
	new file:   public/assets/social/48x48/youtube_raso.png
	new file:   public/assets/social/64x64/delicious-2ea8c729b4d9c0e76eb19b9d30649f68.png
	new file:   public/assets/social/64x64/delicious.png
	new file:   public/assets/social/64x64/digg-656c4059725745e77e99744fc5eb3922.png
	new file:   public/assets/social/64x64/digg.png
	new file:   public/assets/social/64x64/facebook-12330a4a1655baa9c28ad41795c942b2.png
	new file:   public/assets/social/64x64/facebook.png
	new file:   public/assets/social/64x64/flickr-47e782938b170afa206c6d5d6c3910f4.png
	new file:   public/assets/social/64x64/flickr.png
	new file:   public/assets/social/64x64/furl-b18f85ab607b7215c7d5cd675c8c8610.png
	new file:   public/assets/social/64x64/furl.png
	new file:   public/assets/social/64x64/reddit-66ec0b5426781bbba0a6512f6a2275d0.png
	new file:   public/assets/social/64x64/reddit.png
	new file:   public/assets/social/64x64/rss-9ff73681695a2acdf2c824160e6d76cf.png
	new file:   public/assets/social/64x64/rss.png
	new file:   public/assets/social/64x64/stumbleupon-6f08db11b7e1b0e127040108581027b8.png
	new file:   public/assets/social/64x64/stumbleupon.png
	new file:   public/assets/social/64x64/technorati-799bd41b27257ea033e9b00894cfc3d7.png
	new file:   public/assets/social/64x64/technorati.png
	new file:   public/assets/social/64x64/twitter-33fe879779545b4240903bc209c7b218.png
	new file:   public/assets/social/64x64/twitter.png
	new file:   public/assets/social/64x64/yahoo-e801b32f18eab4467b17eefaec459e7a.png
	new file:   public/assets/social/64x64/yahoo.png
	new file:   public/assets/social/64x64/youtube-ed59951c09cd5cf86e39be5a454819b3.png
	new file:   public/assets/social/64x64/youtube.png
	new file:   public/assets/social_retro/48x48/blink_list-01e6241cc19cb624cfe0147c07aa8ddf.png
	new file:   public/assets/social_retro/48x48/blink_list.png
	new file:   public/assets/social_retro/48x48/delicious-067b03aa9cc3a648db4635b7e2da81a4.png
	new file:   public/assets/social_retro/48x48/delicious.png
	new file:   public/assets/social_retro/48x48/design_float-20e22749de0e6463dc644407413fc4d5.png
	new file:   public/assets/social_retro/48x48/design_float.png
	new file:   public/assets/social_retro/48x48/digg-672301e522dd383fe914dbc0bfd2be27.png
	new file:   public/assets/social_retro/48x48/digg.png
	new file:   public/assets/social_retro/48x48/facebook_1-726d9c13a67a9ba1a06c6f619f67ad83.png
	new file:   public/assets/social_retro/48x48/facebook_1.png
	new file:   public/assets/social_retro/48x48/facebook_2-d2e0d5f0c5ff02d0dbb3d5aac68f5536.png
	new file:   public/assets/social_retro/48x48/facebook_2.png
	new file:   public/assets/social_retro/48x48/flickr-42975aae39c3d7bc39794e122917d4c2.png
	new file:   public/assets/social_retro/48x48/flickr.png
	new file:   public/assets/social_retro/48x48/friendfees-beb073bc04c1ec86fe93d43c9430f360.png
	new file:   public/assets/social_retro/48x48/friendfees.png
	new file:   public/assets/social_retro/48x48/furl-104107d8edc6057b9faeaf954a0dcf01.png
	new file:   public/assets/social_retro/48x48/furl.png
	new file:   public/assets/social_retro/48x48/google-bbfc0f3da047212d11fb447e617119ae.png
	new file:   public/assets/social_retro/48x48/google.png
	new file:   public/assets/social_retro/48x48/last_fm-4a477e1aa642e48af073d41549e46a4b.png
	new file:   public/assets/social_retro/48x48/last_fm.png
	new file:   public/assets/social_retro/48x48/linkedin-d75f05b6f3e0bc966fffcc2324ebe466.png
	new file:   public/assets/social_retro/48x48/linkedin.png
	new file:   public/assets/social_retro/48x48/mixx-6afe1ee6884f7af4313e82e88f70ac95.png
	new file:   public/assets/social_retro/48x48/mixx.png
	new file:   public/assets/social_retro/48x48/picasa-daa9ce92d696ff18e2907787584516d9.png
	new file:   public/assets/social_retro/48x48/picasa.png
	new file:   public/assets/social_retro/48x48/posterous-e8e5c6d16da3de9f90a38c9e3d217c45.png
	new file:   public/assets/social_retro/48x48/posterous.png
	new file:   public/assets/social_retro/48x48/rebbit-b502703a841d83577452f9dcdc763779.png
	new file:   public/assets/social_retro/48x48/rebbit.png
	new file:   public/assets/social_retro/48x48/rss-02fbaf8d90f485966fb6ee3aaf155756.png
	new file:   public/assets/social_retro/48x48/rss.png
	new file:   public/assets/social_retro/48x48/stumble_upon-842fce5efe0931ab02bcc5bf2b7eca78.png
	new file:   public/assets/social_retro/48x48/stumble_upon.png
	new file:   public/assets/social_retro/48x48/technorati-9203bece12e332da3cca10885555c2e2.png
	new file:   public/assets/social_retro/48x48/technorati.png
	new file:   public/assets/social_retro/48x48/tumblr-33e4c8f2741a6856b637e2d95624b968.png
	new file:   public/assets/social_retro/48x48/tumblr.png
	new file:   public/assets/social_retro/48x48/twitter-39de46cff5c869a7285773957bf60f78.png
	new file:   public/assets/social_retro/48x48/twitter.png
	new file:   public/assets/social_retro/48x48/vimeo-ff9147a24884ffbe6d06b33e08a35f14.png
	new file:   public/assets/social_retro/48x48/vimeo.png
	new file:   public/assets/social_retro/48x48/wordpress-82339f1426230691c97349f36b5a2f8f.png
	new file:   public/assets/social_retro/48x48/wordpress.png
	new file:   public/assets/social_retro/48x48/yahoo-3550d3c84cb660f9700df46295bebfd5.png
	new file:   public/assets/social_retro/48x48/yahoo.png
	new file:   public/assets/social_retro/48x48/youtube-78a6168ad2978c9aa98e1fb1516af988.png
	new file:   public/assets/social_retro/48x48/youtube.png
	new file:   public/assets/social_retro/60x60/blink_list-342151cc8e6dae609db662dff4a6acf5.png
	new file:   public/assets/social_retro/60x60/blink_list.png
	new file:   public/assets/social_retro/60x60/delicious-1e775af0573592b588223f93444b6052.png
	new file:   public/assets/social_retro/60x60/delicious.png
	new file:   public/assets/social_retro/60x60/design_float-17037e6a2be1a63a45d4423eafc83490.png
	new file:   public/assets/social_retro/60x60/design_float.png
	new file:   public/assets/social_retro/60x60/digg-22d7686d9c5a5357b02751e143c4d8d1.png
	new file:   public/assets/social_retro/60x60/digg.png
	new file:   public/assets/social_retro/60x60/facebook_1-0657699b76f4c072c9181dd0c835135a.png
	new file:   public/assets/social_retro/60x60/facebook_1.png
	new file:   public/assets/social_retro/60x60/facebook_2-ff18f1413b081555110a11fe2ba468cf.png
	new file:   public/assets/social_retro/60x60/facebook_2.png
	new file:   public/assets/social_retro/60x60/flickr-a6e5740eb406912fe34f6c22c660c7a4.png
	new file:   public/assets/social_retro/60x60/flickr.png
	new file:   public/assets/social_retro/60x60/friendfees-d08f72f0bc9dff6a236608e5b3863055.png
	new file:   public/assets/social_retro/60x60/friendfees.png
	new file:   public/assets/social_retro/60x60/furl-4e1cc9b43015b24f0f6f77e3c9ca1524.png
	new file:   public/assets/social_retro/60x60/furl.png
	new file:   public/assets/social_retro/60x60/google-62804b890433f0668192089e6e9342b9.png
	new file:   public/assets/social_retro/60x60/google.png
	new file:   public/assets/social_retro/60x60/last_fm-4991d28ffa2758319cf8f92fe0188818.png
	new file:   public/assets/social_retro/60x60/last_fm.png
	new file:   public/assets/social_retro/60x60/linkedin-3bb58694da78a0d969910e47e4dae173.png
	new file:   public/assets/social_retro/60x60/linkedin.png
	new file:   public/assets/social_retro/60x60/mixx-ce9c4fbcf1b7a1f285a1d7928cfa2cf7.png
	new file:   public/assets/social_retro/60x60/mixx.png
	new file:   public/assets/social_retro/60x60/picasa-b23d0ffaf1696c8e9c1570ee875b69e1.png
	new file:   public/assets/social_retro/60x60/picasa.png
	new file:   public/assets/social_retro/60x60/posterous-4afc594b970779f129f0d1b644978564.png
	new file:   public/assets/social_retro/60x60/posterous.png
	new file:   public/assets/social_retro/60x60/reddit-708a61a94385a530d37a77e94bf44b32.png
	new file:   public/assets/social_retro/60x60/reddit.png
	new file:   public/assets/social_retro/60x60/rss-6f98f980062e2c06fa1f9bb980d53deb.png
	new file:   public/assets/social_retro/60x60/rss.png
	new file:   public/assets/social_retro/60x60/stumble_upon-7b4ba580e6b784e7b49a9d7483659568.png
	new file:   public/assets/social_retro/60x60/stumble_upon.png
	new file:   public/assets/social_retro/60x60/technorati-4160f4e750e2c93a77f737d6f23f8683.png
	new file:   public/assets/social_retro/60x60/technorati.png
	new file:   public/assets/social_retro/60x60/tumblr-cc51aeecbe81ba1d880868b5cc9c55f9.png
	new file:   public/assets/social_retro/60x60/tumblr.png
	new file:   public/assets/social_retro/60x60/twitter-29cccad0cdea068a0cd32df5d9425c8b.png
	new file:   public/assets/social_retro/60x60/twitter.png
	new file:   public/assets/social_retro/60x60/vimeo-0e7223e5d84dafe96d4ee445f7f894af.png
	new file:   public/assets/social_retro/60x60/vimeo.png
	new file:   public/assets/social_retro/60x60/wordpress-2354bc3e3452540e6669c845c0a226eb.png
	new file:   public/assets/social_retro/60x60/wordpress.png
	new file:   public/assets/social_retro/60x60/yahoo-b05a23cb4595dea584b915b74221ccc3.png
	new file:   public/assets/social_retro/60x60/yahoo.png
	new file:   public/assets/social_retro/60x60/you_tube-6c7eed5cc0d6a47a4b0a94dde04150d7.png
	new file:   public/assets/social_retro/60x60/you_tube.png
	new file:   public/assets/socialico-fad14ae61c0514fbcb6077b2e61d304e.ttf
	new file:   public/assets/socialico.ttf
	new file:   public/assets/team/project_manager-992fbbc2ef3639d8b879b20a85bd468f.jpg
	new file:   public/assets/team/project_manager.jpg
	new file:   public/assets/team/team_andre-d193f4a87fda760939fbad5b2fd7c03c.jpg
	new file:   public/assets/team/team_andre.jpg
	new file:   public/assets/team/team_andreia-7fa0d026f85aef72c44d9b345c61ca44.jpg
	new file:   public/assets/team/team_andreia.jpg
	new file:   public/assets/team/team_carlos-8810d12ebf77fd378df247d16b0134e9.jpg
	new file:   public/assets/team/team_carlos.jpg
	new file:   public/assets/team/team_claudio-d2cd5ac54e4c568d454f7f3a4643596d.jpg
	new file:   public/assets/team/team_claudio.jpg
	new file:   public/assets/team/team_cunha-f751d28c3239bb10cee14479e4925b40.jpg
	new file:   public/assets/team/team_cunha.jpg
	new file:   public/assets/team/team_dany-e027a59519c6a7b3dde46b489c6f4833.jpg
	new file:   public/assets/team/team_dany.jpg
	new file:   public/assets/team/team_diogo-adb0258edb0b60db6bc6e826d99a4513.jpg
	new file:   public/assets/team/team_diogo.jpg
	new file:   public/assets/team/team_felix-dd66a0ce0dfab233589c0b154a0999fa.jpg
	new file:   public/assets/team/team_felix.jpg
	new file:   public/assets/team/team_filipe-873b964a1a9a533d5ce8794e965bce00.jpg
	new file:   public/assets/team/team_filipe.jpg
	new file:   public/assets/team/team_hugo-9726d0e3adc10b864861721a3e4494a9.jpg
	new file:   public/assets/team/team_hugo.jpg
	new file:   public/assets/team/team_joao-d3a76ae74d98e20c2508f8b6a7a8c1ea.jpg
	new file:   public/assets/team/team_joao.jpg
	new file:   public/assets/team/team_nuno-f47e217c87155bab027685f9645bc36c.jpg
	new file:   public/assets/team/team_nuno.jpg
	new file:   public/assets/team/team_paulo-5eafc3dbeab5b4ed6f889ce676efc4a3.jpg
	new file:   public/assets/team/team_paulo.jpg
	new file:   public/assets/team/team_pedro-d36c8a52538f5ecf6794714432d6aaa7.jpg
	new file:   public/assets/team/team_pedro.jpg
	new file:   public/assets/team/team_ricardo-635350144b3933cd1b9ab63368285ea6.jpg
	new file:   public/assets/team/team_ricardo.jpg
	new file:   public/assets/team/team_samuel-9bd4810332a7ba45621bb946e36b8371.jpg
	new file:   public/assets/team/team_samuel.jpg
	new file:   public/assets/team/team_tiago-3f8816f37aadb27e5a40e0c7687a1ecf.jpg
	new file:   public/assets/team/team_tiago.jpg
	new file:   public/assets/team/team_vitor-a30fd9e9d16d41c146aa5bdb83e90394.jpg
	new file:   public/assets/team/team_vitor.jpg
	modified:   Gemfile
	modified:   Gemfile
	modified:   app/controllers/backoffice/companies_controller.rb
	modified:   app/controllers/rasocomp/users_controller.rb
	modified:   app/views/backoffice/companies/index.html.erb
	modified:   app/views/layouts/rasoemp.html.erb
	modified:   app/views/rasocomp/users/edit.html.erb
	modified:   config/locales/en.yml
	deleted:    public/assets/application-2dea92433c5ef44714ff370f606987d8.js
	deleted:    public/assets/application-2dea92433c5ef44714ff370f606987d8.js.gz
	renamed:    public/assets/application-c3d3a41c2657373d41aefa48e54fa1d3.js -> public/assets/application-4b72adffb3c738bc48be9fec8f0cd986.js
	renamed:    public/assets/application-c3d3a41c2657373d41aefa48e54fa1d3.js.gz -> public/assets/application-4b72adffb3c738bc48be9fec8f0cd986.js.gz
	modified:   public/assets/application-6868ae5649a06059238a9068135885ed.css.gz
	modified:   public/assets/application.css.gz
	modified:   public/assets/application.js
	modified:   public/assets/application.js.gz
	modified:   public/assets/manifest.yml
	modified:   public/assets/public/application-7270767b2a9e9fff880aa5de378ca791.css.gz
	modified:   public/assets/public/application.css.gz
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/views/backoffice/companies/index.html.erb
	app/views/layouts/rasoemp.html.erb
	config/locales/en.yml