va
se cargan las librerias boosttarp
se agrega libreria de bootstrap
- Se crean los DBTables
- Se crean los Dao
- Se crean los Entities
- Se crea conexion Ciisa
- Se crea conexion MySql
- Se agrega Lib Zend
- eliminaron los ejemplos
Se corrige IndexControler
Merge remote-tracking branch 'origin/desarrollo' into desarrollo
Entities, Daos, DbTable
Merge remote-tracking branch 'origin/desarrollo' into desarrollo

Conflicts:
	library/Zend/Amf/Adobe/Auth.php
	library/Zend/Amf/Adobe/DbInspector.php
	library/Zend/Amf/Adobe/Introspector.php
	library/Zend/Amf/Auth/Abstract.php
	library/Zend/Amf/Parse/Resource/MysqlResult.php
	library/Zend/Amf/Parse/Resource/Stream.php
	library/Zend/Amf/Value/Messaging/ArrayCollection.php
	library/Zend/Cache/Backend/ZendServer.php
	library/Zend/Cache/Backend/ZendServer/Disk.php
	library/Zend/Cache/Backend/ZendServer/ShMem.php
	library/Zend/Captcha/Exception.php
	library/Zend/Cloud/AbstractFactory.php
	library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php
	library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php
	library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php
	library/Zend/Cloud/QueueService/Adapter/ZendQueue.php
	library/Zend/Cloud/QueueService/Message.php
	library/Zend/Config/Json.php
	library/Zend/Config/Writer/Json.php
	library/Zend/Config/Writer/Yaml.php
	library/Zend/Config/Yaml.php
	library/Zend/Gdata/App/Feed.php
	library/Zend/Gdata/App/FeedEntryParent.php
	library/Zend/Gdata/Books.php
	library/Zend/Gdata/Books/VolumeQuery.php
	library/Zend/Gdata/Docs.php
	library/Zend/Gdata/Docs/DocumentListEntry.php
	library/Zend/Gdata/Docs/DocumentListFeed.php
	library/Zend/Gdata/Docs/Query.php
	library/Zend/Gdata/DublinCore.php
	library/Zend/Gdata/Exif.php
	library/Zend/Gdata/Exif/Entry.php
	library/Zend/Gdata/Exif/Extension/Distance.php
	library/Zend/Gdata/Exif/Extension/Exposure.php
	library/Zend/Gdata/Exif/Extension/FStop.php
	library/Zend/Gdata/Exif/Extension/Flash.php
	library/Zend/Gdata/Exif/Extension/FocalLength.php
	library/Zend/Gdata/Exif/Extension/ImageUniqueId.php
	library/Zend/Gdata/Exif/Extension/Iso.php
	library/Zend/Gdata/Exif/Extension/Make.php
	library/Zend/Gdata/Exif/Extension/Model.php
	library/Zend/Gdata/Exif/Extension/Tags.php
	library/Zend/Gdata/Exif/Extension/Time.php
	library/Zend/Gdata/Exif/Feed.php
	library/Zend/Gdata/Geo.php
	library/Zend/Gdata/Geo/Entry.php
	library/Zend/Gdata/Geo/Extension/GeoRssWhere.php
	library/Zend/Gdata/Geo/Extension/GmlPoint.php
	library/Zend/Gdata/Geo/Extension/GmlPos.php
	library/Zend/Gdata/Geo/Feed.php
	library/Zend/Gdata/Health.php
	library/Zend/Gdata/Health/Extension/Ccr.php
	library/Zend/Gdata/Health/ProfileEntry.php
	library/Zend/Gdata/Health/ProfileFeed.php
	library/Zend/Gdata/Health/ProfileListEntry.php
	library/Zend/Gdata/Health/ProfileListFeed.php
	library/Zend/Gdata/Health/Query.php
	library/Zend/Gdata/Media.php
	library/Zend/Gdata/Media/Entry.php
	library/Zend/Gdata/Media/Extension/MediaCategory.php
	library/Zend/Gdata/Media/Extension/MediaContent.php
	library/Zend/Gdata/Media/Extension/MediaCopyright.php
	library/Zend/Gdata/Media/Extension/MediaCredit.php
	library/Zend/Gdata/Media/Extension/MediaDescription.php
	library/Zend/Gdata/Media/Extension/MediaGroup.php
	library/Zend/Gdata/Media/Extension/MediaHash.php
	library/Zend/Gdata/Media/Extension/MediaKeywords.php
	library/Zend/Gdata/Media/Extension/MediaPlayer.php
	library/Zend/Gdata/Media/Extension/MediaRating.php
	library/Zend/Gdata/Media/Extension/MediaRestriction.php
	library/Zend/Gdata/Media/Extension/MediaText.php
	library/Zend/Gdata/Media/Extension/MediaThumbnail.php
	library/Zend/Gdata/Media/Extension/MediaTitle.php
	library/Zend/Gdata/Media/Feed.php
	library/Zend/Gdata/Photos.php
	library/Zend/Gdata/Photos/AlbumEntry.php
	library/Zend/Gdata/Photos/AlbumFeed.php
	library/Zend/Gdata/Photos/AlbumQuery.php
	library/Zend/Gdata/Photos/CommentEntry.php
	library/Zend/Gdata/Photos/Extension/Access.php
	library/Zend/Gdata/Photos/Extension/AlbumId.php
	library/Zend/Gdata/Photos/Extension/BytesUsed.php
	library/Zend/Gdata/Photos/Extension/Checksum.php
	library/Zend/Gdata/Photos/Extension/Client.php
	library/Zend/Gdata/Photos/Extension/CommentCount.php
	library/Zend/Gdata/Photos/Extension/CommentingEnabled.php
	library/Zend/Gdata/Photos/Extension/Height.php
	library/Zend/Gdata/Photos/Extension/Id.php
	library/Zend/Gdata/Photos/Extension/Location.php
	library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
	library/Zend/Gdata/Photos/Extension/Name.php
	library/Zend/Gdata/Photos/Extension/Nickname.php
	library/Zend/Gdata/Photos/Extension/NumPhotos.php
	library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
	library/Zend/Gdata/Photos/Extension/PhotoId.php
	library/Zend/Gdata/Photos/Extension/Position.php
	library/Zend/Gdata/Photos/Extension/QuotaCurrent.php
	library/Zend/Gdata/Photos/Extension/QuotaLimit.php
	library/Zend/Gdata/Photos/Extension/Rotation.php
	library/Zend/Gdata/Photos/Extension/Size.php
	library/Zend/Gdata/Photos/Extension/Thumbnail.php
	library/Zend/Gdata/Photos/Extension/Timestamp.php
	library/Zend/Gdata/Photos/Extension/User.php
	library/Zend/Gdata/Photos/Extension/Version.php
	library/Zend/Gdata/Photos/Extension/Weight.php
	library/Zend/Gdata/Photos/Extension/Width.php
	library/Zend/Gdata/Photos/PhotoEntry.php
	library/Zend/Gdata/Photos/PhotoFeed.php
	library/Zend/Gdata/Photos/PhotoQuery.php
	library/Zend/Gdata/Photos/TagEntry.php
	library/Zend/Gdata/Photos/UserEntry.php
	library/Zend/Gdata/Photos/UserFeed.php
	library/Zend/Gdata/Photos/UserQuery.php
	library/Zend/Gdata/YouTube/Extension/Control.php
	library/Zend/Gdata/YouTube/Extension/CountHint.php
	library/Zend/Gdata/YouTube/Extension/Link.php
	library/Zend/Gdata/YouTube/Extension/MediaContent.php
	library/Zend/Gdata/YouTube/Extension/MediaGroup.php
	library/Zend/Gdata/YouTube/Extension/MediaRating.php
	library/Zend/Gdata/YouTube/Extension/Private.php
	library/Zend/Gdata/YouTube/Extension/Token.php
	library/Zend/Gdata/YouTube/MediaEntry.php
	library/Zend/Http/Client/Adapter/Stream.php
	library/Zend/Http/Response/Stream.php
	library/Zend/Service/Amazon/Exception.php
	library/Zend/Service/Amazon/S3.php
	library/Zend/Service/Amazon/S3/Exception.php
	library/Zend/Service/Amazon/S3/Stream.php
	library/Zend/Service/Twitter.php
	library/Zend/Service/Twitter/Exception.php
ok
Se agrega libreria zend
Agrega obtenerPorId en Area Entity
Merge branch 'rfribla' into desarrollo

Conflicts:
	application/models/AmigoDao.php
	application/models/AreaDao.php
	application/views/scripts/index/index.phtml
Conflicto AreaDao
obt todos
Merge branch 'rfribla' into desarrollo
Metodos de entidades
algo de login
a
Merge branch 'cderby' into rfribla

Conflicts:
	application/controllers/IndexController.php
	application/layouts/scripts/layout.phtml
	application/models/AmigoDao.php
-Se guardan tokens en bbdd
-Se crea el dao obetener tokens
-Se utilizan los tokens para publicar en las redes sociales